updated to (mostly) fufill evaluation milestone 1 requirements