Start lineup code refactoring

Just ignore MQ in JS and do it all at once