Trying some debugging
OF course now it works when I try to debug
Reorganized some stuff and added test running
Updated some prop methods and general cleanup