prototype features

This is the approach our group of 4 has taken to merge our previous architectures and develop a working prototype together.