Mamma, without bloat code! Finally got rid of all the different interfaces and all extra lines. Still needs removeing lots of old code, done incommit
