Second commit, just doing things... still. MORE THINGS!