working prototype
resolved conflicts