all necessary classes serializable
preparing to pull
fixed merge conflicts