Build to medium level coding - still need comments