more work done, still not functional :/