more stuff added, still not final