Dev

Added more documentation, started move to enums.