Serious update 2 of 2 - better defined flow of project