Commented away code that made it a bit buggy, will get to it later...