moved stuff around and working on search filters