Adding in fields and working on the functionality