Committing the small bit of work i've done for now.