Working on #24, sorry for the hacks