Beta 1

Now includes all methods.