Updated and streamlined

Changed design and made it smaller. Still in progress.