WIP - added a bunch of stuff.