Added SCM and moved some things around