V2 working
Changes after mentor took a look
merged V2 and Refactor