Started forms

Updated data, started adding forms