Still unworking - about to switch frameworks