Revert "Added most of the kamikaze functionality and prettied up some functions"

This reverts commit 8fdd8e20eaa63e7e9f12ca280430555be1bbb9f9.
Fixed my merge -- also added most of the Kamikaze functionality and prettied up some code