got other stuff working. still need zerochecks
Merge remote-tracking branch 'origin/Kyle'
Alpha Second Partial