Alpha 2

Major changes in alpha and needs to be reflected in master (no stable release yet)