Slightly refactored
trying to make files the same as ollie's