Get rid of more exception driven logic and fix a silly mistake.  Re-enables shapes.  Will probably break on Windows now :P