Good enough for now - but this will probably need to move to router/controller type class eventually