#246 - Get general tab working