Lots of changes! Ready for first print attempt