Removed blacklist and implementedone-off solution

Wow this is getting complicated.