Working1

Making changes to the master for what is here so far.