I really need to commit more often >_>