Updated pull with saving functionality and modularized.