[WIP DO NOT MERGE] - add final feature