Lots of Updates

Updated class structure, built program, running basic queries.