Cleaned up a bit. Still need to fix commands client side.