Hacked on it a bit