Started some work on typing