second commit, still have bugs