1st commit, added stuff from work