Restructured & functional; list of features to add