Initial checkin of standalone refactor
Include all machines if includes not specified