Implemented a couple more structures and simplified the handlers where possible.