final commit hopefully, fleshing out methods