More frontend work, some integration of backend, yet to be tested