Cleanup + added Base URL
May want to USE that too...
Oops