Beta 2

@harrison  can you review?