Cleaning up + started on the form stuff