features completed

:checkered_flag: