First actual commit
Further development of the spike