Did some clean up, fixed inhertiance and simplified things for the future.