Cleaned up stuff from 3396e476c0133a10e75cafb0e54a1c63a9af30ff
Fixed stuff I forgot to test, derp
Added shields back in, whoops
Merge pull request #33 from KittyTristy/working

Cleaning and fixing things