Super commit with a lot of work done, still missing finish genetic class