Making some progress, took a lot of stuff out