Mostly working... 2nd part of submit not working yet...