Still preparing for Subnets; moved a lot of function into classes; got rid of a lot of pointers; deleted some includes!