huge update, now consists of 2 tables, still not working though..