forgot a couple peices on the last commit :P