Starting to add some fields and functionality.