Classes to fill

Also need dot and line objects