yey more modular n flexi n sexi. some regression but meh magician ftw!