Big changes-this is getting usable :).