Fill in some functionality
Fill in some of the stubs