Major refactor coming
Clean up