#261 Issue Complete (Except Image Update)