Glued the packages together and fixed the inevitable bugs