Lots of changes to alpha2

alpha2 ready to become main design