Added back a bunch of stuff from the old app