Divided library into two source files for now...