Removed Proprietary; Basic Rewrite of Movement