Have everything working in both environments

Now it's time to develop!