Getting pretty close, still something funky going on