Minor updates before beginning forlder restructure
Testing of callback-based functionallity