got somethign working but still not right