Hacky extra credit implementation