Finished refactoring/consolidating methods; Left in console logs for debugging