Wow, really really really cleaned up script includes.