formatted the applicationContext a little better
adding TODOs for later