Starting refactoring to suit my needs on two or more machines