Major Changes
-framework bug fixes
-move logic
-kill logic