A couple of quick fixes, still got a bug where all parts are Vanilla - next step - unit tests