more functionality added, backend stuff close to done