Near-Final version

Working, if you ignore the bugs