Compilable refactor and removing more un-needed rubbish
 - Going to take some work to make the remote operational