WIP: Adding domain validator; removing pry blocks