basic functionality is working, still needs polish
forgot some files