Final poosh

@c0d3d Can we merge this branch and delete it, or do you need it separate for some reason?