Edited for final presentation! Still working though