Hammerififed Files

Files updated to work with Hammer
Trying this