Final design nearing; need to add tests for erros and each of the filtering options
Fixed component number logic to be more robust