Small changes

- Draw added
- Testing some swing