Console is now fully functional (although basic) except for resizing
Fixed merges