Alpha version

Lots to do yet..