Forward1

Forward facing refactoring to make first time developer setup easier.