added stuff and things
aaargh