Finished Core Feature

Finished Core Feature