Basic packaging now in place. Time to fix the (many) bugs