Adding in more build steps + renovations