Moved some data helpers to model form add form

Signed-off-by: Tom Wright <tom@inflatablecookie.com>