Cleaned up IDE mess and got display code working