Massive restructure started
committing what I have despite not working yet