Commit after finishing work for the day, some sharc stuff added.