Revert "Revert "Basic Armor Push""

This reverts commit 76a157a934b409211fcb7246623d70f7edc12c46.