added classes from week 1 and singleton