Updated views, added conditional displays, LEARNED A BUNCH OF COOL STUFF