First fully implemented commit, no known bugs