Add more form fields
Add heaps of stuff so devices work