added * for select, some other basic functionality, updated TODO