Adding profiles

Issue 21 completed including changes recommended below.