Moving a bunch of stuff around to get the front end working