Almost done! Just need to add filters and do testing.