Making Final Additions

Getting into some additional features today