Cleaned up janky code a bit, needs better command handling.