Second commit, everything should be included in this one