Reverting the messy git madness. Hopefully things work now!