Bugs fixed, now we just gotta populate the database