Rough start to rebuild, needs work on compositing