Worked on command handling and blocks