Revision 1 - Passes basic test

Passes Basic test