Setting up

Here I just tried to put everything back in shape for us to continue
developing.