Version 0.5

Added forms
Cleanups