-Add in the current state of Aaron's architecture.  Finally got all of the casting and stuff working.  Also made some tweaks to better fit the code architecture.