Currently Working

Added more general changes, moved some things around for legibility