Added prototype work and more