Finished Company and Metrics classes, cleaned up code via Abstract beans, needs heavy testing...