Solves #5 and #2

TODO: Still not worn Form POST !