Starting overhaul of internals to handle rapgenius update