Initial

Minor Changes for now, more on the way