Initial work

Way to early/late to argue...I'll change it.