all works now, need some decoration and validation