Moved old code, started clean up of old code