Got the bugs worked out, just need to clean up