Removed some old stuff, finshed basic command parsing