Second Commit

Fixed crash but still has drawing issues.