Still editing

Need to test drawing specifics