WIP, adding lots of stuff