More merging. Reworked vitaboy used for CAS now.
First attempt at merge complete. Hopefully nothing was lost... but if anyone notices anything let me know and ill do a sanity on that entire area of code.