Second commit

Too bothered to explain, commented enough.