Finally Implemented + Fixes