Major developement is DONE

All of this is done... Next is minor changes and clean up!