Redo

Redo based on code academy workshop