Cleaned up a little - more needed later
I thin kit worked, now needs clean up and refactoring