Implemented the basics of the 2nd prototype