Complete re-write initial commit