committing before I mess with object oriented stuff