Some more functionality and stuff and things