Added a whole mess of stuff