Updated to a more minimal boilerplate and inline with how I work today