Saving my work. beginning to fix some minor bugs