Think I got all the bugs now