restructured things, added some commands too