Feature/cs473 proj3