Initial Working

Kit refactor (mostly) complete. Sample feature created.