More work on validator + added TODOs