Works, still had some issues with the db queryes