Issues #170 #171 #172 Done with the FrontEnd