Final commit

The whole kit'n'kaboodle