Added specs for more stuff + a working prototype