Mostly working, need to perform validation.