Added more and condensed structure (still WIP)

Will use some other method to set all to false (if needed?). Also, WIP =
work in progress