Added some more stubs for configs and some todos