Working

With extra bugs!