Updates to structure. Filled in code for a few simple functions