Continued implementing prototype