second commit, add more functionality :)