Moved everything into marlin