Version 2.0

Pasting sensen's code on top of everything