Server Pull

Due to Alpha and Beta Stages, I have been recently editing from the
server. This Commit and a copy from the server to local