made some major progress
fixed merge issues: