Version 3

Finished it