fixed stuff, almost there, just need to add pagination