Still a couple errors to hammer out