Beta 1

Features are complete