Tested

Tested and finished code