Reworking some code, in progress
Updated search to play nicer