Deleted original branch #14 then cleaned up code from old copy into new