Project Update

Added some more updates to project code + added some methods to reduce
# of lines.