Took a lot of stuff out, time for revamp