Major refactor from spring to ninja