Cleaned up a lot and added some new roles and todo file