Finished separate file class