Updated with Hammer Build

Lots of changes, responsiveness mainly