Resolved WOLF-45

Signed-off-by: Spencer George <george3@uwm.edu>
Fixed WOLF-60

Signed-off-by: Spencer George <george3@uwm.edu>