Update to latest working dir, will be redesigning structure and current functions