Inital Commit

Code still in progress....