Adds some more functionality

A little spotty. Sorry.