Almost ready for publish

Needs some minor polishing i guess