have most of basic functionality added, no session saving