started working on better lookup system, also added Jasmine tests to the system