[WIP] [Needs Revision] Basic Implementation