main commit; committing rest of code