Cleaned up and got working on orion