Updated Epoch Build

-Completed Issue #15
-Completed Issue #18
-Fixed Issue #17