Getting everything setup for future work; comments and cleanup