This commit might break lots of stuff. Need to back it up though.