Fleshed out a lot of the objects