For expediency, commented out some function calls where we'll likely be doing things differently when we actually come to draw features