documentating and adding namespace
converting to enums
Adding todo