third commit .. backend almost done