Implemented searching etc